merge from trunk

author Joakim Verona <joakim@verona.se>

Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)

committer Joakim Verona <joakim@verona.se>

Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
author Joakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
committer Joakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
committer	Joakim Verona <joakim@verona.se>
	Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)
		1	2
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history